From: Tim Deegan <Tim.Deegan@citrix.com>
Date: Thu, 30 Jun 2011 10:01:04 +0000 (+0100)
Subject: x86/mm: fix the non-debug build
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~10089
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=217c9831a9b0da2ab04008fd9181d8ef2da7504d;p=xen.git

x86/mm: fix the non-debug build

Signed-off-by: Tim Deegan <Tim.Deegan@citrix.com>
---

diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c
index 39acd60107..8ac4c4a6b2 100644
--- a/xen/arch/x86/mm/p2m.c
+++ b/xen/arch/x86/mm/p2m.c
@@ -1102,9 +1102,7 @@ p2m_flush_table(struct p2m_domain *p2m)
 void
 p2m_flush(struct vcpu *v, struct p2m_domain *p2m)
 {
-    struct domain *d = p2m->domain;
-
-    ASSERT(v->domain == d);
+    ASSERT(v->domain == p2m->domain);
     vcpu_nestedhvm(v).nv_p2m = NULL;
     p2m_flush_table(p2m);
     hvm_asid_flush_vcpu(v);